Autogenerated HTML docs for v1.5.0-rc0-g13e86
diff --git a/git-clone.html b/git-clone.html index 7be0c15..ff87a1c 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -281,12 +281,12 @@ <div class="sectionbody"> <p>Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository -(visible using <tt>git branch -r</tt>), and creates and checks out a master -branch equal to the cloned repository's master branch.</p> +(visible using <tt>git branch -r</tt>), and creates and checks out an initial +branch equal to the cloned repository's currently active branch.</p> <p>After the clone, a plain <tt>git fetch</tt> without arguments will update all the remote-tracking branches, and a <tt>git pull</tt> without arguments will in addition merge the remote master branch into the -current branch.</p> +current master branch, if any.</p> <p>This default configuration is achieved by creating references to the remote branch heads under <tt>$GIT_DIR/refs/remotes/origin</tt> and by initializing <tt>remote.origin.url</tt> and <tt>remote.origin.fetch</tt> @@ -521,7 +521,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jan-2007 00:04:07 UTC +Last updated 07-Jan-2007 07:43:48 UTC </div> </div> </body>
diff --git a/git-clone.txt b/git-clone.txt index e7085fd..a782074 100644 --- a/git-clone.txt +++ b/git-clone.txt
@@ -18,13 +18,13 @@ Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository -(visible using `git branch -r`), and creates and checks out a master -branch equal to the cloned repository's master branch. +(visible using `git branch -r`), and creates and checks out an initial +branch equal to the cloned repository's currently active branch. After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the -current branch. +current master branch, if any. This default configuration is achieved by creating references to the remote branch heads under `$GIT_DIR/refs/remotes/origin` and
diff --git a/git-svn.html b/git-svn.html index 72cc62c..f92f5e2 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -326,11 +326,13 @@ </dt> <dd> <p> - Commit all diffs from a specified head directly to the SVN + Commit each diff from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or - not there is a diff between SVN and head). It is recommended - that you run git-svn fetch and rebase (not pull) your commits - against the latest changes in the SVN repository. + not there is a diff between SVN and head). This will create + a revision in SVN for each commit in git. + It is recommended that you run git-svn fetch and rebase (not + pull or merge) your commits against the latest changes in the + SVN repository. An optional command-line argument may be specified as an alternative to HEAD. This is advantageous over <em>set-tree</em> (below) because it produces @@ -814,17 +816,18 @@ git-svn multi-init</tt></pre> </div></div> </div> -<h2>REBASE VS. PULL</h2> +<h2>REBASE VS. PULL/MERGE</h2> <div class="sectionbody"> <p>Originally, git-svn recommended that the remotes/git-svn branch be -pulled from. This is because the author favored <em>git-svn set-tree B</em> -to commit a single head rather than the <em>git-svn set-tree A..B</em> notation -to commit multiple commits.</p> -<p>If you use <em>git-svn set-tree A..B</em> to commit several diffs and you do not -have the latest remotes/git-svn merged into my-branch, you should use -<em>git rebase</em> to update your work branch instead of <em>git pull</em>. <em>pull</em> -can cause non-linear history to be flattened when committing into SVN, -which can lead to merge commits reversing previous commits in SVN.</p> +pulled or merged from. This is because the author favored +<em>git-svn set-tree B</em> to commit a single head rather than the +<em>git-svn set-tree A..B</em> notation to commit multiple commits.</p> +<p>If you use <em>git-svn set-tree A..B</em> to commit several diffs and you do +not have the latest remotes/git-svn merged into my-branch, you should +use <em>git rebase</em> to update your work branch instead of <em>git pull</em> or +<em>git merge</em>. <em>pull/merge</em> can cause non-linear history to be flattened +when committing into SVN, which can lead to merge commits reversing +previous commits in SVN.</p> </div> <h2>DESIGN PHILOSOPHY</h2> <div class="sectionbody"> @@ -927,7 +930,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 05-Jan-2007 07:46:19 UTC +Last updated 07-Jan-2007 07:43:50 UTC </div> </div> </body>
diff --git a/git-svn.txt b/git-svn.txt index f754d2f..ce63def 100644 --- a/git-svn.txt +++ b/git-svn.txt
@@ -53,11 +53,13 @@ manually joining branches on commit. 'dcommit':: - Commit all diffs from a specified head directly to the SVN + Commit each diff from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or - not there is a diff between SVN and head). It is recommended - that you run git-svn fetch and rebase (not pull) your commits - against the latest changes in the SVN repository. + not there is a diff between SVN and head). This will create + a revision in SVN for each commit in git. + It is recommended that you run git-svn fetch and rebase (not + pull or merge) your commits against the latest changes in the + SVN repository. An optional command-line argument may be specified as an alternative to HEAD. This is advantageous over 'set-tree' (below) because it produces @@ -408,19 +410,20 @@ git-svn multi-init ------------------------------------------------------------------------ -REBASE VS. PULL ---------------- +REBASE VS. PULL/MERGE +--------------------- Originally, git-svn recommended that the remotes/git-svn branch be -pulled from. This is because the author favored 'git-svn set-tree B' -to commit a single head rather than the 'git-svn set-tree A..B' notation -to commit multiple commits. +pulled or merged from. This is because the author favored +'git-svn set-tree B' to commit a single head rather than the +'git-svn set-tree A..B' notation to commit multiple commits. -If you use 'git-svn set-tree A..B' to commit several diffs and you do not -have the latest remotes/git-svn merged into my-branch, you should use -'git rebase' to update your work branch instead of 'git pull'. 'pull' -can cause non-linear history to be flattened when committing into SVN, -which can lead to merge commits reversing previous commits in SVN. +If you use 'git-svn set-tree A..B' to commit several diffs and you do +not have the latest remotes/git-svn merged into my-branch, you should +use 'git rebase' to update your work branch instead of 'git pull' or +'git merge'. 'pull/merge' can cause non-linear history to be flattened +when committing into SVN, which can lead to merge commits reversing +previous commits in SVN. DESIGN PHILOSOPHY -----------------
diff --git a/git-svnimport.html b/git-svnimport.html index 6594132..4e08b10 100644 --- a/git-svnimport.html +++ b/git-svnimport.html
@@ -278,7 +278,7 @@ [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] [ -s start_chg ] [ -m ] [ -r ] [ -M regex ] [ -I <ignorefile_name> ] [ -A <author_file> ] - [ -P <path_from_trunk> ] + [ -R <repack_each_revs>] [ -P <path_from_trunk> ] <SVN_repository_URL> [ <path> ]</div></div> </div> <h2>DESCRIPTION</h2> @@ -430,6 +430,18 @@ due to SVN memory leaks. (These have been worked around.)</p> </dd> <dt> +-R <repack_each_revs> +</dt> +<dd> +<p> + Specify how often git repository should be repacked. +</p> +<p>The default value is 1000. git-svnimport will do import in chunks of 1000 +revisions, after each chunk git repository will be repacked. To disable +this behavior specify some big value here which is mote than number of +revisions to import.</p> +</dd> +<dt> -P <path_from_trunk> </dt> <dd> @@ -522,7 +534,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 17-Dec-2006 19:31:44 UTC +Last updated 07-Jan-2007 07:43:49 UTC </div> </div> </body>
diff --git a/git-svnimport.txt b/git-svnimport.txt index 2c7c7da..b166cf3 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt
@@ -15,7 +15,7 @@ [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] [ -s start_chg ] [ -m ] [ -r ] [ -M regex ] [ -I <ignorefile_name> ] [ -A <author_file> ] - [ -P <path_from_trunk> ] + [ -R <repack_each_revs>] [ -P <path_from_trunk> ] <SVN_repository_URL> [ <path> ] @@ -108,6 +108,14 @@ Formerly, this option controlled how many revisions to pull, due to SVN memory leaks. (These have been worked around.) +-R <repack_each_revs>:: + Specify how often git repository should be repacked. ++ +The default value is 1000. git-svnimport will do import in chunks of 1000 +revisions, after each chunk git repository will be repacked. To disable +this behavior specify some big value here which is mote than number of +revisions to import. + -P <path_from_trunk>:: Partial import of the SVN tree. +
diff --git a/tutorial.html b/tutorial.html index a29d122..66b00fc 100644 --- a/tutorial.html +++ b/tutorial.html
@@ -300,8 +300,7 @@ </div></div> <p>You've now initialized the working directory—you may notice a new directory created, named ".git". Tell git that you want it to track -every file under the current directory with (notice the dot <em>.</em> -that means the current directory):</p> +every file under the current directory (note the <em>.</em>) with:</p> <div class="listingblock"> <div class="content"> <pre><tt>$ git add .</tt></pre> @@ -313,6 +312,9 @@ </div></div> <p>will prompt you for a commit message, then record the current state of all the files to the repository.</p> +</div> +<h2>Making changes</h2> +<div class="sectionbody"> <p>Try modifying some files, then run</p> <div class="listingblock"> <div class="content"> @@ -323,17 +325,17 @@ make a commit, like this:</p> <div class="listingblock"> <div class="content"> -<pre><tt>$ git add file1 file... +<pre><tt>$ git add file1 file2 file3 $ git commit</tt></pre> </div></div> <p>This will again prompt your for a message describing the change, and then -record the new versions of the files you listed. It is cumbersome -to list all files and you can say <tt>git commit -a</tt> (which stands for <em>all</em>) -instead of running <tt>git add</tt> beforehand.</p> +record the new versions of the files you listed.</p> +<p>Alternatively, instead of running <tt>git add</tt> beforehand, you can use</p> <div class="listingblock"> <div class="content"> <pre><tt>$ git commit -a</tt></pre> </div></div> +<p>which will automatically notice modified (but not new) files.</p> <p>A note on commit messages: Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more @@ -783,7 +785,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 03-Jan-2007 22:02:04 UTC +Last updated 07-Jan-2007 07:43:51 UTC </div> </div> </body>
diff --git a/tutorial.txt b/tutorial.txt index 79884d9..01d4a47 100644 --- a/tutorial.txt +++ b/tutorial.txt
@@ -43,8 +43,7 @@ You've now initialized the working directory--you may notice a new directory created, named ".git". Tell git that you want it to track -every file under the current directory with (notice the dot '.' -that means the current directory): +every file under the current directory (note the '.') with: ------------------------------------------------ $ git add . @@ -59,6 +58,9 @@ will prompt you for a commit message, then record the current state of all the files to the repository. +Making changes +-------------- + Try modifying some files, then run ------------------------------------------------ @@ -70,19 +72,21 @@ make a commit, like this: ------------------------------------------------ -$ git add file1 file... +$ git add file1 file2 file3 $ git commit ------------------------------------------------ This will again prompt your for a message describing the change, and then -record the new versions of the files you listed. It is cumbersome -to list all files and you can say `git commit -a` (which stands for 'all') -instead of running `git add` beforehand. +record the new versions of the files you listed. + +Alternatively, instead of running `git add` beforehand, you can use ------------------------------------------------ $ git commit -a ------------------------------------------------ +which will automatically notice modified (but not new) files. + A note on commit messages: Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more
